Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 4 Apr 2010 11:40:27 +0000 (11:40 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 4 Apr 2010 11:40:27 +0000 (11:40 +0000)

Trivial merge